1 files changed, 13 insertions, 13 deletions

diff --git a/src/teams.c b/src/teams.c
index 46c566c..bebb786 100644
--- a/src/teams.c
+++ b/src/teams.c
@@ -9,22 +9,22 @@
 
 // Setter definitions
 // @set char[]: TEAM.name -> bool
-SETTER(team, name,			ref(char), {
+Setter(team, name,			ref(char), {
 	return !(strncpy(SELF(name), value, 255) == NULL);
 })
 
 // @set char[]: TEAM.institution -> bool
-SETTER(team, institution,	ref(char), {
+Setter(team, institution,	ref(char), {
 	return !(strncpy(SELF(institution), value, 255) == NULL);
 })
 
 // @set char[]: TEAM.member_name, int: id -> bool
-SETTER(team, member_name,	ref(char), {
+Setter(team, member_name,	ref(char), {
 	return (id > 0 && id < 4 && !(strncpy(SELF(member_name)[id-1], value, 255) == NULL));
 }, int id)
 
 // @set int: TEAM.solved -> bool
-SETTER(team, solved,		uint8_t, {
+Setter(team, solved,		uint8_t, {
 	if (value <= 10)
 		SELF(solved) = value;
 	return (value <= 10);
@@ -32,31 +32,31 @@ SETTER(team, solved,		uint8_t, {
 
 // Getter definitions
 // @get TEAM.name -> char[]
-GETTER(team, name,			ptr(char), {
+Getter(team, name,			ptr(char), {
 	return SELF(name);
 })
 
 // @get TEAM.institution -> char[]
-GETTER(team, institution,	ptr(char), {
+Getter(team, institution,	ptr(char), {
 	return SELF(institution);
 })
 
 // @get TEAM.solved -> int
-GETTER(team, solved,		uint8_t, {
+Getter(team, solved,		uint8_t, {
 	return SELF(solved);
 })
 
 static char* const _id_error = (char *)"(incorrect id)"; // C++ fix
 // @get TEAM.member_name, id -> char[]
-GETTER(team, member_name,	ptr(char), {
+Getter(team, member_name,	ptr(char), {
 	return (id > 0 && id < 4)? SELF(member_name)[id - 1] : _id_error;
 }, int id)
 
-DEFINE(team, printf, int, {
+Define(team, printf, int, {
 	return call(self, fprintf, stdout);
 })
 
-DEFINE(team, fprintf, int, {
+Define(team, fprintf, int, {
 	return fprintf(file,
 	               "Team name  : %s\n"
 	               "Institution: %s\n"
@@ -72,7 +72,7 @@ DEFINE(team, fprintf, int, {
 	               SELF(member_name)[2]);
 }, ptr(FILE) file)
 
-DEFINE(team, find_champion, team, {
+Define(team, find_champion, team, {
 	UNUSED(self);
 
 	team champion = teams[num - 1];
@@ -84,7 +84,7 @@ DEFINE(team, find_champion, team, {
 
 
 // base functions
-NEW(team, {
+New(team, {
 	team self = (team)malloc(sizeof(TYPE(team)));
 	if (self)
 	{
@@ -99,6 +99,6 @@ NEW(team, {
 	return self;
 })
 
-DEL(team, {
+Del(team, {
 	if(self) free(self);
 })