diff --git a/envydis/.gitignore b/envydis/.gitignore
index f129e00a..21306e49 100644
--- a/envydis/.gitignore
+++ b/envydis/.gitignore
@@ -1,6 +1,6 @@
 envydis
 envyas
-envylex.c
-envyparse.c
-envyparse.h
+lex.c
+parse.c
+parse.h
 libenvy.a
diff --git a/envydis/CMakeLists.txt b/envydis/CMakeLists.txt
index c720e7d0..f1e13823 100644
--- a/envydis/CMakeLists.txt
+++ b/envydis/CMakeLists.txt
@@ -6,15 +6,15 @@ find_package(BISON REQUIRED)
 
 include_directories(../include)
 
-flex_target(envylex envylex.l ${CMAKE_CURRENT_BINARY_DIR}/envylex.c)
-bison_target(envyparse envyparse.y ${CMAKE_CURRENT_BINARY_DIR}/envyparse.c)
-add_flex_bison_dependency(envylex envyparse)
+flex_target(lex lex.l ${CMAKE_CURRENT_BINARY_DIR}/lex.c)
+bison_target(parse parse.y ${CMAKE_CURRENT_BINARY_DIR}/parse.c)
+add_flex_bison_dependency(lex parse)
 include_directories(.)
 
-add_library(envy coredis.c nv50dis.c nvc0dis.c ctxdis.c fucdis.c hwsqdis.c vp2dis.c vp3mdis.c macrodis.c envyprint.c)
+add_library(envy core.c nv50.c nvc0.c ctx.c fuc.c hwsq.c vp2.c vp3m.c macro.c print.c)
 
 add_executable(envydis envydis.c)
-add_executable(envyas envyas.c ${FLEX_envylex_OUTPUTS} ${BISON_envyparse_OUTPUTS})
+add_executable(envyas envyas.c ${FLEX_lex_OUTPUTS} ${BISON_parse_OUTPUTS})
 
 target_link_libraries(envydis envy)
 target_link_libraries(envyas envy)
diff --git a/envydis/coredis.c b/envydis/core.c
similarity index 100%
rename from envydis/coredis.c
rename to envydis/core.c
diff --git a/envydis/ctxdis.c b/envydis/ctx.c
similarity index 100%
rename from envydis/ctxdis.c
rename to envydis/ctx.c
diff --git a/envydis/fucdis.c b/envydis/fuc.c
similarity index 100%
rename from envydis/fucdis.c
rename to envydis/fuc.c
diff --git a/envydis/hwsqdis.c b/envydis/hwsq.c
similarity index 100%
rename from envydis/hwsqdis.c
rename to envydis/hwsq.c
diff --git a/envydis/envylex.l b/envydis/lex.l
similarity index 100%
rename from envydis/envylex.l
rename to envydis/lex.l
diff --git a/envydis/macrodis.c b/envydis/macro.c
similarity index 100%
rename from envydis/macrodis.c
rename to envydis/macro.c
diff --git a/envydis/nv50dis.c b/envydis/nv50.c
similarity index 100%
rename from envydis/nv50dis.c
rename to envydis/nv50.c
diff --git a/envydis/nvc0dis.c b/envydis/nvc0.c
similarity index 100%
rename from envydis/nvc0dis.c
rename to envydis/nvc0.c
diff --git a/envydis/envyparse.y b/envydis/parse.y
similarity index 100%
rename from envydis/envyparse.y
rename to envydis/parse.y
diff --git a/envydis/envyprint.c b/envydis/print.c
similarity index 100%
rename from envydis/envyprint.c
rename to envydis/print.c
diff --git a/envydis/vp2dis.c b/envydis/vp2.c
similarity index 100%
rename from envydis/vp2dis.c
rename to envydis/vp2.c
diff --git a/envydis/vp3mdis.c b/envydis/vp3m.c
similarity index 100%
rename from envydis/vp3mdis.c
rename to envydis/vp3m.c